--- lxc-1.0.0.beta2-old/templates/lxc-centos.in
+++ lxc-1.0.0.beta2/templates/lxc-centos.in
@@ -27,7 +27,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 #Configurations
-arch=$(arch)
+arch=$(uname -m)
 cache_base=@LOCALSTATEDIR@/cache/lxc/centos/$arch
 default_path=@LXCPATH@
 
--- lxc-1.0.0.beta2-old/templates/lxc-debian.in
+++ lxc-1.0.0.beta2/templates/lxc-debian.in
@@ -20,7 +20,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-MIRROR=${MIRROR:-http://cdn.debian.net/debian}
+MIRROR=${MIRROR:-http://http.debian.net/debian}
 LOCALSTATEDIR="@LOCALSTATEDIR@"
 LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
 
@@ -36,6 +36,21 @@
             mknod $rootfs/dev/tty$tty c 4 $tty
         fi
     done
+    if [ ! -e $rootfs/dev/random ]; then
+      mknod -m 0644 $rootfs/dev/random c 1 8
+    fi
+    if [ ! -e $rootfs/dev/urandom ]; then
+      mknod -m 0644 $rootfs/dev/urandom c 1 9
+    fi
+    if [ -f $rootfs/dev/null ]; then
+      rm -f $rootfs/dev/null
+    fi
+    if [ ! -e $rootfs/dev/null ]; then
+      mknod -m 666 $rootfs/dev/null c 1 3
+    fi
+    if [ ! -e $rootfs/dev/zero ]; then
+      mknod -m 666 $rootfs/dev/zero c 1 5
+    fi
 
     # configure the inittab
     cat <<EOF > $rootfs/etc/inittab
@@ -79,6 +94,7 @@
 
     # reconfigure some services
     if [ -z "$LANG" ]; then
+        echo "en_US.UTF-8 UTF-8" >> $rootfs/etc/locale.gen
         chroot $rootfs locale-gen en_US.UTF-8 UTF-8
         chroot $rootfs update-locale LANG=en_US.UTF-8
     else
@@ -399,7 +415,7 @@
     exit 1
 fi
 
-current_release=`wget ${MIRROR}/dists/stable/Release -O - 2>/dev/null |\
+current_release=`wget -O - ${MIRROR}/dists/stable/Release 2>/dev/null |\
 head |awk '/^Codename: (.*)$/ { print $2; }'`
 release=${release:-${current_release}}
 valid_releases=('squeeze' 'wheezy' 'jessie' 'sid')
Only in lxc-1.0.0.beta2: templates/lxc-debian.in.orig
--- lxc-1.0.0.beta2-old/templates/lxc-fedora.in
+++ lxc-1.0.0.beta2/templates/lxc-fedora.in
@@ -505,7 +505,7 @@
     fi
     done
 
-    TMP_BOOTSTRAP_DIR=$( mktemp -d --tmpdir=${cache_base} bootstrap_XXXXXX )
+    TMP_BOOTSTRAP_DIR=$( mktemp -d -p ${cache_base} bootstrap_XXXXXX )
 
     cd ${TMP_BOOTSTRAP_DIR}
 
--- lxc-1.0.0.beta2-old/src/lxc/lxc-checkconfig.in
+++ lxc-1.0.0.beta2/src/lxc/lxc-checkconfig.in
@@ -10,6 +10,15 @@
 SETCOLOR_WARNING="printf \\033[1;33m"
 SETCOLOR_NORMAL="printf \\033[0;39m"
 
+tmp=$(mktemp)
+if ! type $GREP &> /dev/null; then
+  if type zcat &> /dev/null; then
+    zcat $CONFIG > $tmp
+    CONFIG=$tmp
+    GREP=grep
+  fi
+fi
+
 is_set() {
     $GREP "$1=[y|m]" $CONFIG > /dev/null
     return $?
@@ -123,3 +132,4 @@
 echo "usage : CONFIG=/path/to/config $0"
 echo
 
+rm $tmp
